New Settings Improvements and Fixes (Dev)